Modular Maps#52
Merged
Merged
Conversation
Contributor
Author
|
Okay, tested it Docker, and tested it locally on Windows. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In upstream, the
.dmmmaps for output, ruins, shuttles, etc live in the directory_maps.This base path is hardcoded in many places around the codebase, including the
.dmsource files, the data in the.jsonfiles in the_maps/configsdirectory, and tools undertools.This PR changes this to a define
MAPROOT. When theSTARFLY_MAPSmodule is enabled, we use build tooling to supply modular maps in_maps2eb(_maps 2: Electric Boogaloo).This uses a composition algorithm:
_mapsto_maps2ebmodular_starfly/**/_mapsto_maps2eb(i.e.: our modules overwrite upstream maps)_maps2eb, which gives us the ability to remove upstream things that we don't want to replace.In general, we'll leave
_mapsalone; it'll be the destination of upstream changes. We'll do our modifications within our modular_starfly modules.Note: This PR is like #37 but I think this one actually works?